From 51e8df94ba7620780c12681ad8d947a6ce1edc48 Mon Sep 17 00:00:00 2001 From: Kuwamura Shin'ya Date: Thu, 29 Jul 2010 16:40:47 +0100 Subject: [PATCH] xend: fix SyntaxError for Python 2.4 or earlier 21866:e017930af272 causes SyntaxError on Python 2.4 or earlier, since the syntax "true_value if condition else false_value" was introduced by Python 2.5. Signed-off-by: KUWAMURA Shin'ya Committed-by: Ian Jackson --- tools/python/xen/xend/XendConfig.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py index 15eaad8e76..8a072955d3 100644 --- a/tools/python/xen/xend/XendConfig.py +++ b/tools/python/xen/xend/XendConfig.py @@ -65,8 +65,10 @@ def bool0(v): def convert_on_crash(v): v = str(v) - return XEN_API_ON_CRASH_BEHAVIOUR_LEGACY[v] \ - if v in XEN_API_ON_CRASH_BEHAVIOUR else v + if v in XEN_API_ON_CRASH_BEHAVIOUR: + return XEN_API_ON_CRASH_BEHAVIOUR_LEGACY[v] + else: + return v # Recursively copy a data struct, scrubbing out VNC passwords. # Will scrub any dict entry with a key of 'vncpasswd' or any -- 2.30.2